SM-386 #185
Merged
SM-386 #185
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Nick95550
approved these changes
Aug 6, 2024
Comment on lines
134
to
155
|
|
||
| function getUnclaimedReward(address node, address user, uint256 cycle) external view returns (uint256) { | ||
| return _getUnclaimedReward(node, user, cycle); | ||
| } | ||
|
|
||
| function _getUnclaimedReward(address node, address user, uint256 cycle) internal view returns (uint256) { | ||
| if (claims[node][user][cycle]) { | ||
| return 0; | ||
| } | ||
|
|
||
| return _getClaim(node, user, cycle); | ||
| } | ||
|
|
||
| function getUnclaimedRewards(address node, address user, uint256[] calldata cycles) external view returns (uint256[] memory) { | ||
| uint256 [] memory unclaimedRewards = new uint256[](cycles.length); | ||
|
|
||
| for (uint256 i = 0; i < cycles.length; i++) { | ||
| unclaimedRewards[i] = _getUnclaimedReward(node, user, cycles[i]); | ||
| } | ||
|
|
||
| return unclaimedRewards; | ||
| } |
There was a problem hiding this comment.
Nit:
Suggested change
| function getUnclaimedReward(address node, address user, uint256 cycle) external view returns (uint256) { | |
| return _getUnclaimedReward(node, user, cycle); | |
| } | |
| function _getUnclaimedReward(address node, address user, uint256 cycle) internal view returns (uint256) { | |
| if (claims[node][user][cycle]) { | |
| return 0; | |
| } | |
| return _getClaim(node, user, cycle); | |
| } | |
| function getUnclaimedRewards(address node, address user, uint256[] calldata cycles) external view returns (uint256[] memory) { | |
| uint256 [] memory unclaimedRewards = new uint256[](cycles.length); | |
| for (uint256 i = 0; i < cycles.length; i++) { | |
| unclaimedRewards[i] = _getUnclaimedReward(node, user, cycles[i]); | |
| } | |
| return unclaimedRewards; | |
| } | |
| function getUnclaimedReward(address node, address user, uint256 cycle) external view returns (uint256) { | |
| return _getUnclaimedReward(node, user, cycle); | |
| } | |
| function getUnclaimedRewards(address node, address user, uint256[] calldata cycles) external view returns (uint256[] memory) { | |
| uint256 [] memory unclaimedRewards = new uint256[](cycles.length); | |
| for (uint256 i = 0; i < cycles.length; i++) { | |
| unclaimedRewards[i] = _getUnclaimedReward(node, user, cycles[i]); | |
| } | |
| return unclaimedRewards; | |
| } | |
| function _getUnclaimedReward(address node, address user, uint256 cycle) internal view returns (uint256) { | |
| if (claims[node][user][cycle]) { | |
| return 0; | |
| } | |
| return _getClaim(node, user, cycle); | |
| } |
| ); | ||
|
|
||
| for (const [i, r] of unclaimedRewards.entries()) { | ||
| expect(r).to.be.eq(BigInt(i + 1) * rewardAmount); |
There was a problem hiding this comment.
Nit:
Suggested change
| expect(r).to.be.eq(BigInt(i + 1) * rewardAmount); | |
| expect(r).to.be.equal(BigInt(i + 1) * rewardAmount); |
There was a problem hiding this comment.
I think .eq is not ambiguous at all
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a small PR that adds the following methods to the
RewardsManagercontract.getClaimgetUnclaimedRewardgetUnclaimedRewardThese methods make it easier for clients to determine if a user has an unclaimed reward for a given cycle.